net: phy: marvell: Fix init function for m88e1145

Commit a058052c changed the generic phy_reset() to clear all bits in
BMCR. This inevitably clears the ANEG bit. m88e1145 requires any
change to ANEG bit to be followed by a software reset. This seems to
be different from other PHYs. Implement read-modify-write procedure
for this PHY init.

Signed-off-by: York Sun <[email protected]>
Acked-by: Joe Hershberger <[email protected]>

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 8041922a02dc6ff533536dd5c96a0df3cfdd0438..b7f300e40f2798c09bfa697d8edc860007fe4c17 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -482,7 +482,10 @@ static int m88e1145_config(struct phy_device *phydev)
 
        genphy_config_aneg(phydev);
 
-       phy_reset(phydev);
+       /* soft reset */
+       reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMCR);
+       reg |= BMCR_RESET;
+       phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, reg);
 
        return 0;
 }